Merge branch 'master' of https://github.com/jluner/cargo
authorjluner <justin.j.luner@gmail.com>
Thu, 25 May 2017 02:15:22 +0000 (21:15 -0500)
committerjluner <justin.j.luner@gmail.com>
Thu, 25 May 2017 02:15:22 +0000 (21:15 -0500)

Trivial merge